Adwaita: fix Gedit style tabs color.

I also introduced a gab between tabs as in the mockups.

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 296ae99ce6e5314e4150929c63ba5ed48e32915b..7be7a672e8842d7009e65dfa787f1559aa3da996 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -890,7 +890,7 @@ column-header {
   -GtkNotebook-initial-gap: 10;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: 1;
+  -GtkNotebook-tab-overlap: -8;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -970,6 +970,7 @@ column-header {
     &.top, &.bottom { padding: $vt_vpadding $vt_hpadding; }
     &.left, &.right { padding: $ht_vpadding $ht_hpadding; }
 
+
     /* works for testnotebookdnd, but there's a superfluous border
        in gedit or web, commented out for now, needs gtk fixes
     &.reorderable-page {
@@ -1066,22 +1067,21 @@ column-header {
       }
     }
     GtkLabel { //tab text
-      // this doesn't affect labels on reorderable pages, not css fault.
       padding: 0 2px; // needed for a nicer focus ring
       font-weight: bold;
       color: $insensitive_fg_color; /* color: inherit doesn't work here */
-       &:backdrop {
+      &:backdrop, &.prelight-page:backdrop {
         color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%);
       }
+    }
+    &.prelight-page GtkLabel, GtkLabel.prelight-page {
       // prelight tab text
-      &.prelight-page {
-        color: mix($fg_color, $insensitive_fg_color, 50%);
-      }
+      color: mix($fg_color, $insensitive_fg_color, 50%);
+    }
+    &.active-page GtkLabel, GtkLabel.active-page {
       // active tab text
-      &.active-page {
-        color: $fg_color;
-        &:backdrop { color: $backdrop_fg_color; }
-      }
+      color: $fg_color;
+      &:backdrop { color: $backdrop_fg_color; }
     }
     .button { //tab close button
       border: 1px solid transparent;

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 998518876b66ea633d8ef9faf3c7d2bc090ebe60..503441a4b19b0c976b4571ec6419c88941f19f1c 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1100,7 +1100,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   -GtkNotebook-initial-gap: 10;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: 1;
+  -GtkNotebook-tab-overlap: -8;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1297,14 +1297,14 @@ column-header .button, column-header .button:hover, column-header .button:active
       font-weight: bold;
       color: #939695;
       /* color: inherit doesn't work here */ }
-      .notebook tab GtkLabel:backdrop {
+      .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
         color: #878b8a; }
-      .notebook tab GtkLabel.prelight-page {
-        color: #c0c2c0; }
-      .notebook tab GtkLabel.active-page {
-        color: #eeeeec; }
-        .notebook tab GtkLabel.active-page:backdrop {
-          color: #c9cbc9; }
+    .notebook tab.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
+      color: #c0c2c0; }
+    .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
+      color: #eeeeec; }
+      .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
+        color: #c9cbc9; }
     .notebook tab .button {
       border: 1px solid transparent;
       icon-shadow: none;

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index da9dd26213674e52d0b1218f0271601b1cb9fae8..16a9217a82879737283f72ec36436c4ce53f3c21 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1100,7 +1100,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   -GtkNotebook-initial-gap: 10;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
-  -GtkNotebook-tab-overlap: 1;
+  -GtkNotebook-tab-overlap: -8;
   -GtkNotebook-has-tab-gap: false;
   -GtkWidget-focus-padding: 0;
   -GtkWidget-focus-line-width: 0;
@@ -1297,14 +1297,14 @@ column-header .button, column-header .button:hover, column-header .button:active
       font-weight: bold;
       color: #8d9091;
       /* color: inherit doesn't work here */ }
-      .notebook tab GtkLabel:backdrop {
+      .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop {
         color: #8d9090; }
-      .notebook tab GtkLabel.prelight-page {
-        color: #5d6263; }
-      .notebook tab GtkLabel.active-page {
-        color: #2e3436; }
-        .notebook tab GtkLabel.active-page:backdrop {
-          color: #54595a; }
+    .notebook tab.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page {
+      color: #5d6263; }
+    .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page {
+      color: #2e3436; }
+      .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop {
+        color: #54595a; }
     .notebook tab .button {
       border: 1px solid transparent;
       icon-shadow: none;